From 114a01a531e2f251344f05a1bd18bd46106a42c7 Mon Sep 17 00:00:00 2001 From: "djm@kirby.fc.hp.com" Date: Fri, 23 Dec 2005 15:14:21 -0600 Subject: [PATCH] Missed portion of domU initrd patch Signed-off-by: --- xen/arch/ia64/xen/dom_fw.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/xen/arch/ia64/xen/dom_fw.c b/xen/arch/ia64/xen/dom_fw.c index b0b89a324d..da10e6ea94 100644 --- a/xen/arch/ia64/xen/dom_fw.c +++ b/xen/arch/ia64/xen/dom_fw.c @@ -861,12 +861,16 @@ dom_fw_init (struct domain *d, char *args, int arglen, char *fw_mem, int fw_mem_ bp->console_info.orig_x = 0; bp->console_info.orig_y = 24; bp->fpswa = 0; - bp->initrd_start = (dom0_start+dom0_size) - - (PAGE_ALIGN(ia64_boot_param->initrd_size) + 4*1024*1024); - bp->initrd_size = ia64_boot_param->initrd_size; - printf(" initrd start %0xlx", bp->initrd_start); - printf(" initrd size %0xlx", bp->initrd_size); - - + if (d == dom0) { + bp->initrd_start = (dom0_start+dom0_size) - + (PAGE_ALIGN(ia64_boot_param->initrd_size) + 4*1024*1024); + bp->initrd_size = ia64_boot_param->initrd_size; + } + else { + bp->initrd_start = d->arch.initrd_start; + bp->initrd_size = d->arch.initrd_len; + } + printf(" initrd start %0xlx", bp->initrd_start); + printf(" initrd size %0xlx", bp->initrd_size); return bp; } -- 2.30.2